@xingyaoww I'll fix the conflicts etc, but I'd love your attention for a bit here: this PR simplifies things in agent-sdk right now, because we actually lost the recognition of the "claude-x" in model names, when the provider had a more complex name than just "anthropic/". In other words, we lost bedrock match. This fixes it.

The cause for that is that we changed at some point in the recent past, from simple match of the core name ("claude-3-5") anywhere in the full provider/model (which is accurate! No Llama will call itself "claude-3-5" 😅), to some code using globbing normalization which forced us to add half a million patterns to account for the variety of forms in which "claude-3-5" is included out there - and it keeps missing some, of course.

I looked into it and I believe that was a mistake I made. This is a revert.

This fixes some reports on slack on Bedrock. I'd love to merge this, to stop the whack-a-mole, rather than hardcoding more stuff in these patterns. I think maybe we can also take them out, but I would still love this revert first.

Summary

• Return to simple core family substring matching across the full raw model string
• Remove fnmatch/globbing and stop using normalization for feature detection
• Update pattern tables to pure substrings (no wildcards)
• Add tests to validate e.g. Bedrock-style names (the most messy)

What & Why

This PR restores the durable invariant:

• if a meaningful family token (e.g., 'claude-3-5-sonnet', 'gpt-4o', 'o3', 'gemini-2.5-pro') appears anywhere in the model string
  => the feature applies.

"bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0" => "claude-3-5-sonnet" applies.

This eliminates the pattern maintenance whack-a-mole caused by dotted prefixes and provider-specific suffixes and aligns again with proven behavior in the wild.

Recent refactor introduced fnmatch-based globbing over a normalized basename. This unintentionally diverged from the prior V0 behavior where we effectively matched by substring on the full provider/model name. That change broke real-world cases, notably with AWS Bedrock where names embed dotted vendor prefixes and version suffixes inside the basename (e.g., bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0). Our patterns like 'claude-3-5-sonnet*' stopped matching after normalization and globbing.

Implementation Details

1. model_matches()

   • Lowercase + strip the incoming model string and perform case-insensitive substring checks on the full raw string
   • For each pattern, lowercase/strip and drop any trailing '*' (migration aid); treat the remaining token as a plain substring
   • Return True on first match; False otherwise
   • No use of normalize_model_name() here

2. Pattern tables: remove '*'

   • FUNCTION_CALLING_PATTERNS, REASONING_EFFORT_PATTERNS, PROMPT_CACHE_PATTERNS, SUPPORTS_STOP_WORDS_FALSE_PATTERNS, RESPONSES_API_PATTERNS now contain pure substrings
   • Provider-qualified entries remain supported by virtue of substring matching against the raw string

3. normalize_model_name()

   • Not used by matching. Tests exercising normalization for matching were removed to avoid confusion

4. Tests

   • Remove wildcard expectations; adapt to pure substring semantics
   • Ensure Bedrock coverage: e.g., 'bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0' enables function calling and prompt cache
   • Verify provider-qualified substrings gate as expected (e.g., 'openai/gpt-4o' matches 'openai/gpt-4o' but not 'anthropic/*')
   • Keep conservative defaults for unknown models

Outcomes

• Clear behavior: if the essential family token appears in the model string, the feature applies
• Fewer special-case patterns and more durable matching across providers
• Restores pre-refactor semantics that worked reliably in practice

Checklist

• Code formatted and linted via pre-commit
• Updated tests for sdk changes; all impacted sdk tests pass locally

Closes #844

@enyst can click here to continue refining the PR

Agent Server images for this PR

• GHCR package: https://github.com/OpenHands/agent-sdk/pkgs/container/agent-server

Variants & Base Images

Pull (multi-arch manifest)

docker pull ghcr.io/openhands/agent-server:45b3ece-python

Run

docker run -it --rm \
  -p 8000:8000 \
  --name agent-server-45b3ece-python \
  ghcr.io/openhands/agent-server:45b3ece-python

All tags pushed for this build

ghcr.io/openhands/agent-server:45b3ece-golang
ghcr.io/openhands/agent-server:v1.0.0a5_golang_tag_1.21-bookworm_binary
ghcr.io/openhands/agent-server:45b3ece-java
ghcr.io/openhands/agent-server:v1.0.0a5_eclipse-temurin_tag_17-jdk_binary
ghcr.io/openhands/agent-server:45b3ece-python
ghcr.io/openhands/agent-server:v1.0.0a5_nikolaik_s_python-nodejs_tag_python3.12-nodejs22_binary

The 45b3ece tag is a multi-arch manifest (amd64/arm64); your client pulls the right arch automatically.

Cross-repo impact: Fix: OpenHands/OpenHands#11248